Quddus Chong
5abde23cf5
am ef7e8ccb: am 791def59: am b8fb239a: Merge "docs: Updated API Overview and Behavior Changes docs for M Preview 3." into mnc-dev
...
* commit 'ef7e8ccb185dbcddec29259c7a6a8b58096ecf52':
docs: Updated API Overview and Behavior Changes docs for M Preview 3.
2015-08-16 02:48:32 +00:00
Daniel Sandler
98e684e7f4
am b66e755b: am 64b05c0f: am 9f238a94: Merge "Introducing M Land." into mnc-dev
...
* commit 'b66e755bdba57f163f25d08c207ef598eea7edae':
Introducing M Land.
2015-08-16 02:48:26 +00:00
Dan Sandler
87c1e1b8a1
am 415c6cb2: am 8c8387d2: resolved conflicts (again!) for merge of 8ad3e817 to mnc-dr-dev
...
* commit '415c6cb2358a0ad4821ec58c287b1de94de78d72':
"I tried to think of the most harmless thing."
2015-08-16 02:48:19 +00:00
Geoff Mendal
567139efb3
am a5e012e6: Merge commit \'8dcda391c79e8c2fd20a87834f1f61645aa771ea\' into cw-e-dev
...
* commit 'a5e012e6236aaeabd6d00fa7c6b29ec146ffd764':
resolved conflicts for merge of 8ad3e817 to mnc-dr-dev
2015-08-16 02:39:19 +00:00
Quddus Chong
ef7e8ccb18
am 791def59: am b8fb239a: Merge "docs: Updated API Overview and Behavior Changes docs for M Preview 3." into mnc-dev
...
* commit '791def59b9858efd1334da5d01fb906051dcc028':
docs: Updated API Overview and Behavior Changes docs for M Preview 3.
2015-08-16 02:36:45 +00:00
Daniel Sandler
b66e755bdb
am 64b05c0f: am 9f238a94: Merge "Introducing M Land." into mnc-dev
...
* commit '64b05c0fd413d481cea19e9590732e8219a60912':
Introducing M Land.
2015-08-16 02:36:39 +00:00
Dan Sandler
415c6cb235
am 8c8387d2: resolved conflicts (again!) for merge of 8ad3e817 to mnc-dr-dev
...
* commit '8c8387d235b780c4a78a54d8240fe1f5a17c6af5':
"I tried to think of the most harmless thing."
2015-08-16 02:36:17 +00:00
Geoff Mendal
a5e012e623
Merge commit '8dcda391c79e8c2fd20a87834f1f61645aa771ea' into cw-e-dev
2015-08-15 19:25:34 -07:00
Quddus Chong
791def59b9
am b8fb239a: Merge "docs: Updated API Overview and Behavior Changes docs for M Preview 3." into mnc-dev
...
* commit 'b8fb239ac53ab462c8de12635c84c2216cf57f3b':
docs: Updated API Overview and Behavior Changes docs for M Preview 3.
2015-08-16 01:33:44 +00:00
Daniel Sandler
64b05c0fd4
am 9f238a94: Merge "Introducing M Land." into mnc-dev
...
* commit '9f238a9455639fccb6f44abd03752e3bb3bbc91e':
Introducing M Land.
2015-08-16 01:33:37 +00:00
Dan Sandler
8c8387d235
resolved conflicts (again!) for merge of 8ad3e817 to mnc-dr-dev
...
Change-Id: I5b47fdbb8a9712c104f12c25b80063048849cebd
2015-08-15 18:33:29 -04:00
Daniel Sandler
8dcda391c7
resolved conflicts for merge of 8ad3e817 to mnc-dr-dev
...
Change-Id: Ic4ea07a337b8d831f281b0a4048d0b4132597aa7
2015-08-15 00:03:09 -07:00
Quddus Chong
b8fb239ac5
Merge "docs: Updated API Overview and Behavior Changes docs for M Preview 3." into mnc-dev
2015-08-14 20:44:54 +00:00
Adam Lesinski
eb694bb6e6
am 546909c9: am 479c482c: am 504600bb: Merge "Fix UserHandle.getAppIdFromSharedAppGid to allow system UIDs" into mnc-dev
...
* commit '546909c9901f3acc659b3402fbf7320c96f562ad':
Fix UserHandle.getAppIdFromSharedAppGid to allow system UIDs
2015-08-14 20:04:16 +00:00
Daniel Sandler
9f238a9455
Merge "Introducing M Land." into mnc-dev
2015-08-14 19:59:48 +00:00
Daniel Sandler
8ad3e81701
Merge ""I tried to think of the most harmless thing."" into mnc-dev
2015-08-14 19:59:35 +00:00
Adam Lesinski
546909c990
am 479c482c: am 504600bb: Merge "Fix UserHandle.getAppIdFromSharedAppGid to allow system UIDs" into mnc-dev
...
* commit '479c482ca1788235afc776125eb6a79f1d9281c8':
Fix UserHandle.getAppIdFromSharedAppGid to allow system UIDs
2015-08-14 19:56:38 +00:00
Dan Sandler
8df3cfe6b8
Introducing M Land.
...
The "M" is for Multiplayer.
Bug: 21984798
Change-Id: Id752b8efe54ff0ac38854a129188027137d64dd5
2015-08-14 15:51:13 -04:00
Adam Lesinski
479c482ca1
am 504600bb: Merge "Fix UserHandle.getAppIdFromSharedAppGid to allow system UIDs" into mnc-dev
...
* commit '504600bb09e51f0187d81cacb1dc2de77c6256b6':
Fix UserHandle.getAppIdFromSharedAppGid to allow system UIDs
2015-08-14 19:47:54 +00:00
Julia Reynolds
8dd0bce617
am 4e65a05f: am ac5f9628: am 7df411d0: Merge "Clear calling identity before getting the current user." into mnc-dev
...
* commit '4e65a05fb9d23f732e1cb72b67bc4fb2b7321788':
Clear calling identity before getting the current user.
2015-08-14 19:43:21 +00:00
Adam Lesinski
504600bb09
Merge "Fix UserHandle.getAppIdFromSharedAppGid to allow system UIDs" into mnc-dev
2015-08-14 19:38:34 +00:00
Julia Reynolds
4e65a05fb9
am ac5f9628: am 7df411d0: Merge "Clear calling identity before getting the current user." into mnc-dev
...
* commit 'ac5f962898de5a00fa2067e987b94bc28c5bb096':
Clear calling identity before getting the current user.
2015-08-14 19:30:28 +00:00
Dan Sandler
deafeedc81
"I tried to think of the most harmless thing."
...
Bug: 21984798
Change-Id: I33ffabb72c831ff814363601a82ac9a388cb1e99
2015-08-14 15:25:55 -04:00
Julia Reynolds
ac5f962898
am 7df411d0: Merge "Clear calling identity before getting the current user." into mnc-dev
...
* commit '7df411d0cced4a849bcdca58fa3c27eb731e0862':
Clear calling identity before getting the current user.
2015-08-14 19:22:04 +00:00
Julia Reynolds
7df411d0cc
Merge "Clear calling identity before getting the current user." into mnc-dev
2015-08-14 19:17:31 +00:00
Jorim Jaggi
c74a43bba7
am 4fb3e9b3: am 50ff3afb: Start pulse fading exactly when screen is turned on
...
* commit '4fb3e9b3af6c44b3b4bc7eee0cb917520aa7474d':
Start pulse fading exactly when screen is turned on
2015-08-14 19:10:43 +00:00
Jorim Jaggi
4fb3e9b3af
am 50ff3afb: Start pulse fading exactly when screen is turned on
...
* commit '50ff3afb01f2ac4a93dba418a71d54ad8adeba9d':
Start pulse fading exactly when screen is turned on
2015-08-14 19:01:55 +00:00
Jorim Jaggi
50ff3afb01
Start pulse fading exactly when screen is turned on
...
Bug: 23163299
Change-Id: I0f6d5dbfa02e455292e06a4f8f69ab68e9da2b6b
2015-08-14 18:47:59 +00:00
Jean-Michel Trivi
c81daf7ff1
am db56efe6: am 2152edeb: am 16fa58cb: Merge "Fix to check the incoming userid argument for RingtonePlayer" into mnc-dev
...
* commit 'db56efe685d249e1e0e415b3e5b2086b5c2c205c':
Fix to check the incoming userid argument for RingtonePlayer
2015-08-14 18:47:04 +00:00
Jean-Michel Trivi
db56efe685
am 2152edeb: am 16fa58cb: Merge "Fix to check the incoming userid argument for RingtonePlayer" into mnc-dev
...
* commit '2152edeb3058ab9072b843bb32fbbadcc3957460':
Fix to check the incoming userid argument for RingtonePlayer
2015-08-14 18:38:51 +00:00
Jean-Michel Trivi
2152edeb30
am 16fa58cb: Merge "Fix to check the incoming userid argument for RingtonePlayer" into mnc-dev
...
* commit '16fa58cb133f539016a5e013897c7de7f58ff16d':
Fix to check the incoming userid argument for RingtonePlayer
2015-08-14 18:33:08 +00:00
Jean-Michel Trivi
16fa58cb13
Merge "Fix to check the incoming userid argument for RingtonePlayer" into mnc-dev
2015-08-14 18:19:17 +00:00
Chris Tate
13845aeae3
am b2d4c550: am b47890c4: am 7e7d79ef: Merge "Make "Ask every time" actually work that way" into mnc-dev
...
* commit 'b2d4c5507f82286cbb4b3d06f813459e6591164a':
Make "Ask every time" actually work that way
2015-08-14 17:30:05 +00:00
Dianne Hackborn
1058bf0f99
am e2fd2850: am 9e398eb5: am 81f3a85a: Merge "Fix issue #22940169 : "pm grant" can no longer grant permissions..." into mnc-dev
...
* commit 'e2fd2850450391bba5892faf4e90aff9107dd5dc':
Fix issue #22940169 : "pm grant" can no longer grant permissions...
2015-08-14 17:29:59 +00:00
Quddus Chong
9b8e179d5e
docs: Updated API Overview and Behavior Changes docs for M Preview 3.
...
Change-Id: Ibff73ca9321ba1b117c361402d8045d9558c5c2f
2015-08-14 10:22:09 -07:00
Chris Tate
b2d4c5507f
am b47890c4: am 7e7d79ef: Merge "Make "Ask every time" actually work that way" into mnc-dev
...
* commit 'b47890c4e7a7fc119e74da2b50bf94c2cf172916':
Make "Ask every time" actually work that way
2015-08-14 17:21:52 +00:00
Dianne Hackborn
e2fd285045
am 9e398eb5: am 81f3a85a: Merge "Fix issue #22940169 : "pm grant" can no longer grant permissions..." into mnc-dev
...
* commit '9e398eb51497dbcd2347cb1315933fa4e7cfcd9e':
Fix issue #22940169 : "pm grant" can no longer grant permissions...
2015-08-14 17:21:46 +00:00
Chris Tate
b47890c4e7
am 7e7d79ef: Merge "Make "Ask every time" actually work that way" into mnc-dev
...
* commit '7e7d79ef2f4aa6a8da86af459d419bd24c47b440':
Make "Ask every time" actually work that way
2015-08-14 17:15:37 +00:00
Dianne Hackborn
9e398eb514
am 81f3a85a: Merge "Fix issue #22940169 : "pm grant" can no longer grant permissions..." into mnc-dev
...
* commit '81f3a85aa29d83ed1a5de4de1006587d375a1c77':
Fix issue #22940169 : "pm grant" can no longer grant permissions...
2015-08-14 17:15:33 +00:00
Chris Tate
7e7d79ef2f
Merge "Make "Ask every time" actually work that way" into mnc-dev
2015-08-14 17:11:30 +00:00
Dianne Hackborn
81f3a85aa2
Merge "Fix issue #22940169 : "pm grant" can no longer grant permissions..." into mnc-dev
2015-08-14 17:06:20 +00:00
Svetoslav Ganov
340314fd03
am 7c3d595a: am 4b655fd1: am b045331f: Merge "Add GTS test to ensure valid default permission grants - framework" into mnc-dev
...
* commit '7c3d595a3d2bdded486a01d6b00a435f4881ceed':
Add GTS test to ensure valid default permission grants - framework
2015-08-14 15:26:59 +00:00
Svetoslav Ganov
7c3d595a3d
am 4b655fd1: am b045331f: Merge "Add GTS test to ensure valid default permission grants - framework" into mnc-dev
...
* commit '4b655fd193992afff948df513c7b9b9a0389972e':
Add GTS test to ensure valid default permission grants - framework
2015-08-14 15:19:47 +00:00
Svetoslav Ganov
4b655fd193
am b045331f: Merge "Add GTS test to ensure valid default permission grants - framework" into mnc-dev
...
* commit 'b045331fcb033507072bfd7899a147bb2be7176e':
Add GTS test to ensure valid default permission grants - framework
2015-08-14 15:13:38 +00:00
Svetoslav Ganov
b045331fcb
Merge "Add GTS test to ensure valid default permission grants - framework" into mnc-dev
2015-08-14 15:06:16 +00:00
Adam Lesinski
621e06a64d
Fix UserHandle.getAppIdFromSharedAppGid to allow system UIDs
...
System UIDs are also run as shared GIDs, so this should not throw
an exception.
Bug:23189342
Change-Id: Ia180db012c25615cde1720ae0d41d1378f7bfb1a
2015-08-13 22:06:31 -07:00
Christopher Tate
56f0ff3c48
Make "Ask every time" actually work that way
...
..in link-opening behavior. If a candidate is marked as "ask
every time," then the user is guaranteed to get a disambiguation
prompt including that candidate even when some other candidate
app is in the "always prefer this over a browser" state.
Bug 23147746
Change-Id: I904d8697a992b3f16f32b1c1b49c2bf9424c7137
2015-08-13 18:56:05 -07:00
Jeff Sharkey
4efd3f26ac
am d28991a5: am b6f5bcd0: am cfcf6af9: Merge "Method to show DialogFragment allowing state loss." into mnc-dev
...
* commit 'd28991a5e4c8b32c1bffab6078e93249c1d5b7a6':
Method to show DialogFragment allowing state loss.
2015-08-14 01:42:07 +00:00
Jeff Sharkey
d28991a5e4
am b6f5bcd0: am cfcf6af9: Merge "Method to show DialogFragment allowing state loss." into mnc-dev
...
* commit 'b6f5bcd0c64676ad2dfddc9dcf4c4320fafb9d3a':
Method to show DialogFragment allowing state loss.
2015-08-14 01:35:40 +00:00
Joe Fernandez
b189e87b5c
am e135f5b7: am 672c0a75: am 37dd5240: Merge "Doc change: Update preview pages for dp3." into mnc-dev
...
* commit 'e135f5b70596ac3857983c0e4abbba5565dad6ea':
Doc change: Update preview pages for dp3.
2015-08-14 01:33:57 +00:00
