Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
255,075 Commits 3 Branches 0 Tags
bcbed91c2fd96fbe96c8d2633c0c6ecb4e2df481
Commit Graph

255075 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sudheer Shanka
373492b076 DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles. am: 7ef684713e am: 9f6bd40108 
am: f01ee1c291  -s ours

Change-Id: I9bf603d8e6315552d8d00036aa67dc96e9ba678a
 2016-07-30 05:18:59 +00:00
Sudheer Shanka
28acd0fae9 Merge \\"DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles.\\" into lmp-mr1-dev am: dbbdb6d089 
am: 9ed6bd83ff

Change-Id: I4f3bac4ecfc819dcca55a5bc725060b63c1b80ea
 2016-07-30 05:08:39 +00:00
Sudheer Shanka
f01ee1c291 DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles. am: 7ef684713e 
am: 9f6bd40108

Change-Id: Id8afe281abcf8e9b07d7a92daacf922952273573
 2016-07-30 05:08:35 +00:00
Sudheer Shanka
9ed6bd83ff Merge \"DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles.\" into lmp-mr1-dev 
am: dbbdb6d089

Change-Id: I53e854c96f9bf68855ea949a640c4701e0b2ba5e
 2016-07-30 04:54:27 +00:00
Sudheer Shanka
9f6bd40108 DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles. 
am: 7ef684713e

Change-Id: I0a9fa6126709e9cf3d3be7653f48503613d10f27
 2016-07-30 04:54:25 +00:00
Kevin Hufnagle
72108d200d Merge \"docs: Improved Google Play Developer Console documentation\" into nyc-docs 
am: 88f0518ce3

Change-Id: I7fa7fc49019e1489837cb051729d41ee321b92dc
 2016-07-30 04:45:14 +00:00
Kevin Hufnagle
e37a55b840 docs: Improved Google Play Developer Console documentation 
am: ec8b21a27a

Change-Id: Ie49e420caa8986855678ac6c702fbca9aa837cdb
 2016-07-30 04:45:09 +00:00
Sungsoo Lim
3d58e326d9 Merge \"DO NOT MERGE: Fix CTS regression\" into lmp-dev 
am: 124cc534f8  -s ours

Change-Id: I960e31d55b6c47df345457afbd505c50afeebcfa
 2016-07-30 04:44:18 +00:00
Sungsoo Lim
0fb1075d95 DO NOT MERGE: Fix CTS regression 
am: edc9238514  -s ours

Change-Id: If11ad6b402e48aebcce8afc6d5f6093bde539a6e
 2016-07-30 04:44:16 +00:00
Hidehiko Tsuchiya
5acd41d155 Fix the API compatibility of "UriMatcher#addURI" 
The previous patch (ef23bf19 Allow leading slash in path...) made
a single slash path unmatchable.
To solve it, this patch stops removing a slash character if the path
only has a slash character.
Now, a single slash is a matchable path for a URI without path string.

Bug: 29524484
Change-Id: I90b357aa48be1a3e0cf36e75ed2a9d6532908972
 2016-07-30 01:47:50 +00:00
Sungsoo Lim
124cc534f8 Merge "DO NOT MERGE: Fix CTS regression" into lmp-dev 2016-07-29 23:18:52 +00:00
Kevin Hufnagle
88f0518ce3 Merge "docs: Improved Google Play Developer Console documentation" into nyc-docs 2016-07-29 22:01:20 +00:00
Sudheer Shanka
b7c3ae1a86 Merge "Allow apps with CREATE_USERS permission to call UM.getProfiles." into nyc-dev 2016-07-29 21:50:41 +00:00
Sudheer Shanka
e140322bde Merge "DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles." into mnc-dev 2016-07-29 21:50:38 +00:00
Sudheer Shanka
dbbdb6d089 Merge "DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles." into lmp-mr1-dev 2016-07-29 21:50:33 +00:00
Dirk Dougherty
1035b25825 Doc change: escape lt char in generic type in pre block. 
Change-Id: Ia3267d2bb591dc7545c1b5feefbe74659d79f824
 2016-07-29 14:44:15 -07:00
Mark Lu
e6e257f46e Merge \\"docs: fix escaped characters in data binding doc\\" into nyc-docs am: 4172905146 
am: 06c1159b0a

Change-Id: I1fff6816d546f43f0da72cef2fccba445c817b3e
 2016-07-29 21:03:02 +00:00
Mark Lu
ee15ca4437 docs: fix escaped characters in data binding doc am: 011c07bd80 
am: 494d775cde

Change-Id: If30c7493e1a24fd3a1417eea9f9bc647cc31abce
 2016-07-29 21:02:58 +00:00
Sungsoo Lim
878abb9bf4 DO NOT MERGE: Fix CTS regression am: df17644db7 am: 057b548171 am: f645010092 -s ours am: 6489d870d7 -s ours am: 2dbb64594a am: b6a3e8ce8e am: b8d3dd2472 -s ours am: e0316fc7a8 am: bfdf9592d0 am: 59cb7ab7b8 am: 49f14fa7e0 -s ours 
am: 53e9affbf9

Change-Id: Ic185caf8064a4077fafb5046e7b4a15de2d0122b
 2016-07-29 20:55:43 +00:00
Mark Lu
06c1159b0a Merge \"docs: fix escaped characters in data binding doc\" into nyc-docs 
am: 4172905146

Change-Id: I89e1aeade45c0faf78f569eda75a98f1cf81b773
 2016-07-29 20:54:47 +00:00
Mark Lu
494d775cde docs: fix escaped characters in data binding doc 
am: 011c07bd80

Change-Id: I319973e92d7e3687c240b71783add9c74af478ce
 2016-07-29 20:54:45 +00:00
Mark Lu
4172905146 Merge "docs: fix escaped characters in data binding doc" into nyc-docs 2016-07-29 20:41:09 +00:00
Sungsoo Lim
53e9affbf9 DO NOT MERGE: Fix CTS regression am: df17644db7 am: 057b548171 am: f645010092 -s ours am: 6489d870d7 -s ours am: 2dbb64594a am: b6a3e8ce8e am: b8d3dd2472 -s ours am: e0316fc7a8 am: bfdf9592d0 am: 59cb7ab7b8 
am: 49f14fa7e0  -s ours

Change-Id: I2e6b505b24592dbcbc23e4d8c4025ad9972b73ad
 2016-07-29 20:37:47 +00:00
Kevin Hufnagle
ec8b21a27a docs: Improved Google Play Developer Console documentation 
The "In-app Promotions," "Preparing Your In-app Billing Application,"
"In-app Billing Overview," and "Developer Console" pages now contain
up-to-date content and use a cleaner writing style.

Bug: 29358568
Change-Id: I0d21fba8ef6bedbacdb38e7a5203041e79cb455f
 2016-07-29 20:34:17 +00:00
Sungsoo Lim
49f14fa7e0 DO NOT MERGE: Fix CTS regression am: df17644db7 am: 057b548171 am: f645010092 -s ours am: 6489d870d7 -s ours am: 2dbb64594a am: b6a3e8ce8e am: b8d3dd2472 -s ours am: e0316fc7a8 am: bfdf9592d0 
am: 59cb7ab7b8

Change-Id: I166f91e72d1da65610d0f7d697dd70ddb9cfe96a
 2016-07-29 20:10:28 +00:00
Sungsoo Lim
ccad5a8f22 DO NOT MERGE: Fix CTS regression am: 7a92dc9d99 am: 14abf736c8 am: 2df9864b54 -s ours am: 0bbdc37b60 am: 25782fae9b am: dd2ec80035 am: d056456fe2 -s ours 
am: cd17df0011

Change-Id: I2b2918e853613959e09a6e0cb005072a831b1c84
 2016-07-29 20:03:48 +00:00
Sungsoo Lim
cd17df0011 DO NOT MERGE: Fix CTS regression am: 7a92dc9d99 am: 14abf736c8 am: 2df9864b54 -s ours am: 0bbdc37b60 am: 25782fae9b am: dd2ec80035 
am: d056456fe2  -s ours

Change-Id: Ifb5115f0efac94fbbbb622d442bd32c49df085f5
 2016-07-29 19:54:42 +00:00
Sungsoo Lim
59cb7ab7b8 DO NOT MERGE: Fix CTS regression am: df17644db7 am: 057b548171 am: f645010092 -s ours am: 6489d870d7 -s ours am: 2dbb64594a am: b6a3e8ce8e am: b8d3dd2472 -s ours am: e0316fc7a8 
am: bfdf9592d0

Change-Id: I2ceb67ac584b8fe681ffcb812ebff2f8d7ae721e
 2016-07-29 19:52:34 +00:00
Sungsoo Lim
bfdf9592d0 DO NOT MERGE: Fix CTS regression am: df17644db7 am: 057b548171 am: f645010092 -s ours am: 6489d870d7 -s ours am: 2dbb64594a am: b6a3e8ce8e am: b8d3dd2472 -s ours 
am: e0316fc7a8

Change-Id: I0047256a9e88bedc24389de46c0e9f92430fe607
 2016-07-29 19:48:00 +00:00
Sungsoo Lim
4d90202dd3 DO NOT MERGE: Fix CTS regression am: 90be39c7bb am: db9f504522 am: b04c428935 am: e71159c5f7 -s ours 
am: 204fdc49fc

Change-Id: I923456f924901516f86504ba25699ae38d1c205c
 2016-07-29 19:47:51 +00:00
Sungsoo Lim
d056456fe2 DO NOT MERGE: Fix CTS regression am: 7a92dc9d99 am: 14abf736c8 am: 2df9864b54 -s ours am: 0bbdc37b60 am: 25782fae9b 
am: dd2ec80035

Change-Id: I27b22faf8d6ad4bba039a1eca699bd4163c2ad6a
 2016-07-29 19:46:13 +00:00
Sungsoo Lim
e0316fc7a8 DO NOT MERGE: Fix CTS regression am: df17644db7 am: 057b548171 am: f645010092 -s ours am: 6489d870d7 -s ours am: 2dbb64594a am: b6a3e8ce8e 
am: b8d3dd2472  -s ours

Change-Id: I3875a28849df618a392a88480271bf1ac8ef776e
 2016-07-29 19:35:54 +00:00
Sungsoo Lim
dd2ec80035 DO NOT MERGE: Fix CTS regression am: 7a92dc9d99 am: 14abf736c8 am: 2df9864b54 -s ours am: 0bbdc37b60 
am: 25782fae9b

Change-Id: I9fe008924b75ac7d348e0aa8c478f859a4ed743b
 2016-07-29 19:24:37 +00:00
Sungsoo Lim
204fdc49fc DO NOT MERGE: Fix CTS regression am: 90be39c7bb am: db9f504522 am: b04c428935 
am: e71159c5f7  -s ours

Change-Id: I0b07f82bf5df950dd03ff93d863033ea23510186
 2016-07-29 19:21:41 +00:00
Sungsoo Lim
b8d3dd2472 DO NOT MERGE: Fix CTS regression am: df17644db7 am: 057b548171 am: f645010092 -s ours am: 6489d870d7 -s ours am: 2dbb64594a 
am: b6a3e8ce8e

Change-Id: I51997dc68fc55e523050b4e642cdc4a22cd60f09
 2016-07-29 19:14:02 +00:00
Sungsoo Lim
b6a3e8ce8e DO NOT MERGE: Fix CTS regression am: df17644db7 am: 057b548171 am: f645010092 -s ours am: 6489d870d7 -s ours 
am: 2dbb64594a

Change-Id: I04df61df1a926dbfe42d22127bdd4baabe7235d4
 2016-07-29 19:03:14 +00:00
Sungsoo Lim
25782fae9b DO NOT MERGE: Fix CTS regression am: 7a92dc9d99 am: 14abf736c8 am: 2df9864b54 -s ours 
am: 0bbdc37b60

Change-Id: If4f25ea9d5a921fb264d67137fc0af05d84e614e
 2016-07-29 19:02:55 +00:00
Sungsoo Lim
e71159c5f7 DO NOT MERGE: Fix CTS regression am: 90be39c7bb am: db9f504522 
am: b04c428935

Change-Id: I5781e7822d050426288bbd42faafff31f098aa99
 2016-07-29 19:02:43 +00:00
Sungsoo Lim
0bbdc37b60 DO NOT MERGE: Fix CTS regression am: 7a92dc9d99 am: 14abf736c8 
am: 2df9864b54  -s ours

Change-Id: Ie0bc2aab0856dc6fae328571f5bc5938b43f9f49
 2016-07-29 18:56:25 +00:00
Sungsoo Lim
2dbb64594a DO NOT MERGE: Fix CTS regression am: df17644db7 am: 057b548171 am: f645010092 -s ours 
am: 6489d870d7  -s ours

Change-Id: I2631c56fbb3d7130b5389ed232c1a2fe0859b053
 2016-07-29 18:56:07 +00:00
Sungsoo Lim
b04c428935 DO NOT MERGE: Fix CTS regression am: 90be39c7bb 
am: db9f504522

Change-Id: I83a02495ec4116d2bc2001325037f5864bb92c9a
 2016-07-29 18:50:29 +00:00
Sungsoo Lim
2df9864b54 DO NOT MERGE: Fix CTS regression am: 7a92dc9d99 
am: 14abf736c8

Change-Id: I2a35f4853aa450ccc68862c166b6139ce67a1aad
 2016-07-29 18:50:25 +00:00
Sungsoo Lim
6489d870d7 DO NOT MERGE: Fix CTS regression am: df17644db7 am: 057b548171 
am: f645010092  -s ours

Change-Id: Iad2f1d1a445e4891892f03294fed028b71f94368
 2016-07-29 18:45:45 +00:00
Sungsoo Lim
14abf736c8 DO NOT MERGE: Fix CTS regression 
am: 7a92dc9d99

Change-Id: I13605f366810c158d380b11a814da8eac3e4e213
 2016-07-29 18:38:07 +00:00
Sungsoo Lim
f645010092 DO NOT MERGE: Fix CTS regression am: df17644db7 
am: 057b548171

Change-Id: I0ac1fec4b64a09dc8ee12986d8d91b39e511d989
 2016-07-29 18:38:06 +00:00
Sungsoo Lim
db9f504522 DO NOT MERGE: Fix CTS regression 
am: 90be39c7bb

Change-Id: Ie32ddd18c9342b36b8d989ab4d715b30ff608949
 2016-07-29 18:32:49 +00:00
Sungsoo Lim
057b548171 DO NOT MERGE: Fix CTS regression 
am: df17644db7

Change-Id: Id9bed3c68661176a72bcb606e0fc0a026173ac22
 2016-07-29 18:31:07 +00:00
Sudheer Shanka
7468091329 Allow apps with CREATE_USERS permission to call UM.getProfiles. 
Bug: 29189712
Bug: 30317026
Bug: 30235113
Change-Id: I899f13898773483ee627a974d70173b5aa962e9a
 2016-07-29 11:04:47 -07:00
Sudheer Shanka
8a8d7e7962 DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles. 
Bug: 29189712
Bug: 30317026
Bug: 30235113
Change-Id: Icced9805a56675e86f894c458c4a5a0048fd54c0
 2016-07-29 10:55:06 -07:00
Sudheer Shanka
7ef684713e DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles. 
Bug: 29189712
Bug: 30317026
Bug: 30235113
Change-Id: Icced9805a56675e86f894c458c4a5a0048fd54c0
 2016-07-29 10:51:02 -07:00