summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 70dbf05d: am 528c64e2: Merge "Repair broken keychain wifi_uid logic" into ↵Robin Lee2015-02-021-2/+2
|\ | | | | | | | | | | | | lmp-mr1-dev automerge: d16231d * commit '70dbf05d50f29685f0754a35c96fe2b041b5ac2f': Repair broken keychain wifi_uid logic
| * am 528c64e2: Merge "Repair broken keychain wifi_uid logic" into lmp-mr1-devRobin Lee2015-02-021-2/+2
| |\ | | | | | | | | | | | | | | | | | | automerge: d16231d * commit 'd16231de248aeb5aeccb8f4aa226a2f1b34cc082': Repair broken keychain wifi_uid logic
| | * am 528c64e2: Merge "Repair broken keychain wifi_uid logic" into lmp-mr1-devRobin Lee2015-02-021-2/+2
| | |\ | | | | | | | | | | | | | | | | * commit '528c64e205bf1d8f8237fb4e582d152958345b92': Repair broken keychain wifi_uid logic
| | | * Merge "Repair broken keychain wifi_uid logic" into lmp-mr1-devRobin Lee2015-02-021-2/+2
| | | |\
| | | | * Repair broken keychain wifi_uid logicRobin Lee2015-01-301-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check for cross-user installs was missing a short-circuit for installs where no UID was specified. This is now added. Bug: 19194391 Change-Id: I10aa8323b47e0fcabb59e7c30d677080bb80b976
* | | | | am 55ebba9b: Change to fit color name text on color selection spinner in ↵Sanket Padawe2015-01-302-2/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | settings. automerge: a46c723 automerge: f99df05 * commit '55ebba9bedcfec79586426ccebda55b5b7af45f9': Change to fit color name text on color selection spinner in settings.
| * | | | Change to fit color name text on color selection spinner in settings. ↵Sanket Padawe2015-01-302-2/+1
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: a46c723 automerge: f99df05 * commit 'f99df057acb077e7601ec11d27be1bca0265247b': Change to fit color name text on color selection spinner in settings.
| | * | | Change to fit color name text on color selection spinner in settings.Sanket Padawe2015-01-302-2/+1
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | automerge: a46c723 * commit 'a46c7236b6d71c861b49d20dd7515a9031764909': Change to fit color name text on color selection spinner in settings.
| | | * | Change to fit color name text on color selection spinner in settings.Sanket Padawe2015-01-302-2/+1
| | | |/ | | | | | | | | | | | | | | | | Bug: 19206902 Change-Id: I5903ac6d6c1abd7a33a0c47483335114e28a0f51
* | | | am b33c8ad5: am ef72625b: am ab845180: Remove sim status and imei for ↵Sanket Padawe2015-01-301-0/+7
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | secondary user. * commit 'b33c8ad518796e7931cff157b06f791384d575d8': Remove sim status and imei for secondary user.
| * | | am ef72625b: am ab845180: Remove sim status and imei for secondary user.Sanket Padawe2015-01-301-0/+7
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit 'ef72625b5243f2afc6b63553ce57f439801d6977': Remove sim status and imei for secondary user.
| | * | am ab845180: Remove sim status and imei for secondary user.Sanket Padawe2015-01-301-0/+7
| | |\ \ | | | |/ | | | | | | | | | | | | * commit 'ab84518009c53e28e021f27696cd4e51360fccbc': Remove sim status and imei for secondary user.
| | | * Remove sim status and imei for secondary user.Sanket Padawe2015-01-291-0/+7
| | | | | | | | | | | | | | | | | | | | Bug: 19165700 Change-Id: I4cc4b09a66acb3c88ac33e6479b165b6872404c8
* | | | am 922e602b: am b749c336: am c4dba451: am b26bec1a: am 83930bc3: am ↵Fyodor Kupolov2015-01-290-0/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | a6c8a0e6: am d8b606b8: am 2f3bc3cb: (-s ours) am e3904c4f: am e8e7b9b3: Added a check if a custom activity can be started automerge: 3a3ff59 automerge: 5b2b7e1 * commit '922e602b3ab6b0ea22b0f84e29bad1b8ffbe8a02':
| * | | am b749c336: am c4dba451: am b26bec1a: am 83930bc3: am a6c8a0e6: am ↵Fyodor Kupolov2015-01-290-0/+0
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | d8b606b8: am 2f3bc3cb: (-s ours) am e3904c4f: am e8e7b9b3: Added a check if a custom activity can be started automerge: 3a3ff59 automerge: 5b2b7e1 * commit 'b749c3368c0bd40a84026b44189e9119a0a27d15':
| | * | am c4dba451: am b26bec1a: am 83930bc3: am a6c8a0e6: am d8b606b8: am ↵Fyodor Kupolov2015-01-290-0/+0
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | 2f3bc3cb: (-s ours) am e3904c4f: am e8e7b9b3: Added a check if a custom activity can be started automerge: 3a3ff59 automerge: 5b2b7e1 * commit 'c4dba4513b22a59911bfee358c6537f53bbb89a7':
| | | * am b26bec1a: am 83930bc3: am a6c8a0e6: am d8b606b8: am 2f3bc3cb: (-s ours) ↵Fyodor Kupolov2015-01-290-0/+0
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | am e3904c4f: am e8e7b9b3: Added a check if a custom activity can be started automerge: 3a3ff59 automerge: 5b2b7e1 * commit 'b26bec1a6fd7c03d667d7fa83bffd0ee8afb7b3e':
| | | | * am 83930bc3: am a6c8a0e6: am d8b606b8: am 2f3bc3cb: (-s ours) am e3904c4f: ↵Fyodor Kupolov2015-01-290-0/+0
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am e8e7b9b3: Added a check if a custom activity can be started automerge: 3a3ff59 automerge: 5b2b7e1 * commit '83930bc3ee26001e18a3f708e05c0e967e21e559':
| | | | | * am a6c8a0e6: am d8b606b8: am 2f3bc3cb: (-s ours) am e3904c4f: am e8e7b9b3: ↵Fyodor Kupolov2015-01-290-0/+0
| | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added a check if a custom activity can be started automerge: 3a3ff59 automerge: 5b2b7e1 * commit '5b2b7e189766e889118059902a15a4ce2c127e9d':
| | | | | | * am a6c8a0e6: am d8b606b8: am 2f3bc3cb: (-s ours) am e3904c4f: am e8e7b9b3: ↵Fyodor Kupolov2015-01-290-0/+0
| | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added a check if a custom activity can be started automerge: 3a3ff59 * commit '3a3ff591976ef7503d382be2897cad5710cd80e7': Added a check if a custom activity can be started
* | | | | | | \ Merge "Add MIDI to USB configuration developer setting"Mike Lockwood2015-01-291-0/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | Add MIDI to USB configuration developer settingMike Lockwood2015-01-271-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8b2beee25d58c2afb749d4328da6a653e3947aba
* | | | | | | | | am d5363a1e: am 32f0525c: am ac840cd9: am f400051c: am 9e432a69: am ↵Fyodor Kupolov2015-01-290-0/+0
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d7e93570: am f11f9f47: Added a check if a custom activity can be started automerge: 57641a8 automerge: 0738bae * commit 'd5363a1e3ca129fceed8a8b36de66611e4219819':
| * | | | | | | | am 32f0525c: am ac840cd9: am f400051c: am 9e432a69: am d7e93570: am ↵Fyodor Kupolov2015-01-290-0/+0
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f11f9f47: Added a check if a custom activity can be started automerge: 57641a8 automerge: 0738bae * commit '32f0525c78a0777f4811d564b8990214fb157c0c':
| | * | | | | | | am ac840cd9: am f400051c: am 9e432a69: am d7e93570: am f11f9f47: Added a ↵Fyodor Kupolov2015-01-290-0/+0
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | check if a custom activity can be started automerge: 57641a8 automerge: 0738bae * commit 'ac840cd91b77c0a37723723a9d6101beec53bcd1':
| | | * | | | | | am f400051c: am 9e432a69: am d7e93570: am f11f9f47: Added a check if a ↵Fyodor Kupolov2015-01-290-0/+0
| | | |\ \ \ \ \ \ | | | | | |/ / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | custom activity can be started automerge: 57641a8 automerge: 0738bae * commit 'f400051c3a6476154adf185399cb2ad8b2b16657':
| | | | * | | | | am 9e432a69: am d7e93570: am f11f9f47: Added a check if a custom activity ↵Fyodor Kupolov2015-01-290-0/+0
| | | | |\ \ \ \ \ | | | | | | |/ / / | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | can be started automerge: 57641a8 automerge: 0738bae * commit '9e432a698b6422118c2cc0d0a6c12194c9d1fc32':
| | | | | * | | | am d7e93570: am f11f9f47: Added a check if a custom activity can be started ↵Fyodor Kupolov2015-01-290-0/+0
| | | | | |\ \ \ \ | | | | | | | |/ / | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: 57641a8 automerge: 0738bae * commit '0738bae9164b150ce81b8cba57be9105a0308115':
| | | | | | * | | am d7e93570: am f11f9f47: Added a check if a custom activity can be startedFyodor Kupolov2015-01-291-0/+21
| | | | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: 57641a8 * commit '57641a8b5080b5122fcdd98c56fffaef90b3992d': Added a check if a custom activity can be started
* | | | | | | \ \ \ am 3c7ccfe4: am c7e94b04: am 037c8118: am 6355e115: am 77a2e3d6: am ↵Fyodor Kupolov2015-01-290-0/+0
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3a3ff591: am a6c8a0e6: am d8b606b8: am 2f3bc3cb: (-s ours) am e3904c4f: am e8e7b9b3: Added a check if a custom activity can be started * commit '3c7ccfe42ef03e82f912d3d871893436fc9d8102': Added a check if a custom activity can be started
| * | | | | | | | | am c7e94b04: am 037c8118: am 6355e115: am 77a2e3d6: am 3a3ff591: am ↵Fyodor Kupolov2015-01-290-0/+0
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a6c8a0e6: am d8b606b8: am 2f3bc3cb: (-s ours) am e3904c4f: am e8e7b9b3: Added a check if a custom activity can be started * commit 'c7e94b04360a130153fbe4212399b7a31858d316': Added a check if a custom activity can be started
| | * | | | | | | | am 037c8118: am 6355e115: am 77a2e3d6: am 3a3ff591: am a6c8a0e6: am ↵Fyodor Kupolov2015-01-290-0/+0
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d8b606b8: am 2f3bc3cb: (-s ours) am e3904c4f: am e8e7b9b3: Added a check if a custom activity can be started * commit '037c811844cb29a16e940e6fbeae721c12715684': Added a check if a custom activity can be started
| | | * | | | | | | am 6355e115: am 77a2e3d6: am 3a3ff591: am a6c8a0e6: am d8b606b8: am ↵Fyodor Kupolov2015-01-290-0/+0
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2f3bc3cb: (-s ours) am e3904c4f: am e8e7b9b3: Added a check if a custom activity can be started * commit '6355e1152ab29735721c40cfab6431a65341218b': Added a check if a custom activity can be started
| | | | * | | | | | am 77a2e3d6: am 3a3ff591: am a6c8a0e6: am d8b606b8: am 2f3bc3cb: (-s ours) ↵Fyodor Kupolov2015-01-290-0/+0
| | | | |\ \ \ \ \ \ | | | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am e3904c4f: am e8e7b9b3: Added a check if a custom activity can be started * commit '77a2e3d62574be9cf0aae17231fd423a7a399984': Added a check if a custom activity can be started
| | | | | * | | | | am 3a3ff591: am a6c8a0e6: am d8b606b8: am 2f3bc3cb: (-s ours) am e3904c4f: ↵Fyodor Kupolov2015-01-290-0/+0
| | | | | |\ \ \ \ \ | | | | | | | |_|_|/ | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am e8e7b9b3: Added a check if a custom activity can be started * commit '3a3ff591976ef7503d382be2897cad5710cd80e7': Added a check if a custom activity can be started
| | | | | | * | | | am a6c8a0e6: am d8b606b8: am 2f3bc3cb: (-s ours) am e3904c4f: am e8e7b9b3: ↵Fyodor Kupolov2015-01-290-0/+0
| | | | | | |\ \ \ \ | | | | | | | |_|/ / | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added a check if a custom activity can be started * commit 'a6c8a0e66d92bde12ae6f1934f020e7700db05d1': Added a check if a custom activity can be started
| | | | | | | * | | am d8b606b8: am 2f3bc3cb: (-s ours) am e3904c4f: am e8e7b9b3: Added a check ↵Fyodor Kupolov2015-01-290-0/+0
| | | | | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | if a custom activity can be started * commit 'd8b606b81a5ed77d3d2cbbaa7de26853126c25d7': Added a check if a custom activity can be started
| | | | | | | | * \ \ am 2f3bc3cb: (-s ours) am e3904c4f: am e8e7b9b3: Added a check if a custom ↵Fyodor Kupolov2015-01-290-0/+0
| | | | | | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | activity can be started * commit '2f3bc3cb3f5add3962fb0ad441c27d44fede7787': Added a check if a custom activity can be started
| | | | | | | | | * \ \ am e3904c4f: am e8e7b9b3: Added a check if a custom activity can be startedFyodor Kupolov2015-01-291-0/+21
| | | | | | | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e3904c4f09b1a828e2d1f2f3536cdc8eca84a6aa': Added a check if a custom activity can be started
| | | | | | | | | | * \ \ am e8e7b9b3: Added a check if a custom activity can be startedFyodor Kupolov2015-01-291-0/+21
| | | | | | | | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e8e7b9b3811b3295454298b02f136adf0527d1da': Added a check if a custom activity can be started
| | | | | | | | | | | * | | Added a check if a custom activity can be startedFyodor Kupolov2015-01-281-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AppRestrictionsFragment starts an activity using an intent provided by the receiver. A check was added to prevent an app from starting an activity that it does not own. Bug: 14441412 Change-Id: Ia6820b1daf3783d605b92976c78cb522b17dc8f2
* | | | | | | | | | | | | | am 5cf685fa: am d5fcd896: am 9fce9185: am bd89b7b4: am 0d5ad3b7: am ↵Fyodor Kupolov2015-01-290-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 57641a8b: am d7e93570: am f11f9f47: Added a check if a custom activity can be started * commit '5cf685fa0072a391685defa0cb1585e91b465d44': Added a check if a custom activity can be started
| * | | | | | | | | | | | | am d5fcd896: am 9fce9185: am bd89b7b4: am 0d5ad3b7: am 57641a8b: am ↵Fyodor Kupolov2015-01-290-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d7e93570: am f11f9f47: Added a check if a custom activity can be started * commit 'd5fcd8965f894196578fae18613b3ab0f55c45bf': Added a check if a custom activity can be started
| | * | | | | | | | | | | | am 9fce9185: am bd89b7b4: am 0d5ad3b7: am 57641a8b: am d7e93570: am ↵Fyodor Kupolov2015-01-290-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f11f9f47: Added a check if a custom activity can be started * commit '9fce9185513ebaf551ded3937c2767f9ed7bea0f': Added a check if a custom activity can be started
| | | * | | | | | | | | | | am bd89b7b4: am 0d5ad3b7: am 57641a8b: am d7e93570: am f11f9f47: Added a ↵Fyodor Kupolov2015-01-290-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | check if a custom activity can be started * commit 'bd89b7b45ef9572c5e8523f0c8bd723958847df5': Added a check if a custom activity can be started
| | | | * | | | | | | | | | am 0d5ad3b7: am 57641a8b: am d7e93570: am f11f9f47: Added a check if a ↵Fyodor Kupolov2015-01-291-0/+21
| | | | |\ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | custom activity can be started * commit '0d5ad3b73ef524b4aa09e86d3c3a68b48be0d1d1': Added a check if a custom activity can be started
| | | | | * | | | | | | | | am 57641a8b: am d7e93570: am f11f9f47: Added a check if a custom activity ↵Fyodor Kupolov2015-01-291-0/+21
| | | | | |\ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | can be started * commit '57641a8b5080b5122fcdd98c56fffaef90b3992d': Added a check if a custom activity can be started
| | | | | | * | | | | | | | am d7e93570: am f11f9f47: Added a check if a custom activity can be startedFyodor Kupolov2015-01-291-0/+21
| | | | | | |\ \ \ \ \ \ \ \ | | | | | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd7e93570d35cfec4e5de0f3edc5d326ecdb8a442': Added a check if a custom activity can be started
| | | | | | | * | | | | | | am f11f9f47: Added a check if a custom activity can be startedFyodor Kupolov2015-01-291-0/+21
| | | | | | | |\ \ \ \ \ \ \ | | | | | | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f11f9f47d3cfb5d1b9e7da1705252e75913410f1': Added a check if a custom activity can be started
| | | | | | | | * | | | | | Added a check if a custom activity can be startedFyodor Kupolov2015-01-281-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AppRestrictionsFragment starts an activity using an intent provided by the receiver. A check was added to prevent an app from starting an activity that it does not own. Bug: 14441412 Change-Id: Ia6820b1daf3783d605b92976c78cb522b17dc8f2 (cherry picked from commit 07ab95c43e49facb0fc4dd11d68645b4fe8d4c88)