Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
154,015 Commits 3 Branches 0 Tags
d644facfcd415b0ced337c6c2ef116fc4f1e1f63
Commit Graph

2922 Commits

Author SHA1 Message Date
Andres Morales
aa1bcd95cf am 858d04cb: Merge "Mark PDB identifier as SystemApi" into lmp-dev 
* commit '858d04cbf0962acba1ffc0e5df4113c01ed3abec':
  Mark PDB identifier as SystemApi
 2014-09-27 05:27:03 +00:00
Andres Morales
66b63cb825 Merge "Mark PDB identifier as SystemApi" into lmp-dev 2014-09-27 02:26:00 +00:00
Andres Morales
33df937f6f Mark PDB identifier as SystemApi 
Had already marked the API itself as system api, just not
the Context.BLAH id. Also update the javadoc as it doesn't
return an FD anymore.

Change-Id: Ic8a5b8c75b0ba0bdf4ad26cf33d5f87eea568376
 2014-09-26 17:08:59 -07:00
Jeff Sharkey
2649756975 am 45ef18b6: Merge "Include reason when wiping data." into lmp-dev 
* commit '45ef18b63e78fd853865f42d9369a5c9b4dd4ba0':
  Include reason when wiping data.
 2014-09-25 16:22:22 +00:00
Jeff Sharkey
004a4b20f8 Include reason when wiping data. 
This will help us track down who requested a data wipe.

Bug: 17412160
Change-Id: If8413e5d6377773f37e8b34ae3d26347226a027c
 2014-09-24 13:58:09 -07:00
Jeff Sharkey
5c1ac3d443 am e50b0a6c: Merge "More ACTION_CHOOSER ClipData migration." into lmp-dev 
* commit 'e50b0a6c86c70f5ddcb69984cb99337ce1d96032':
  More ACTION_CHOOSER ClipData migration.
 2014-09-24 00:05:53 +00:00
Jeff Sharkey
fb488eb2a2 Merge "More ACTION_CHOOSER ClipData migration." into lmp-dev 2014-09-23 23:58:51 +00:00
Jeff Sharkey
c004eef7bb More ACTION_CHOOSER ClipData migration. 
Traverse into both EXTRA_INTENT and any EXTRA_INITIAL_INTENTS when
migrating extras to ClipData.  Also, we don't need to promote these
ClipData into the parent, since the platform ChooserActivity will
issue any required permission grants for the final user-selected
Intent.  Even if we wanted to, we can't combine the various child
Intent flags into anything meaningful at the ACTION_CHOOSER level.

Bug: 17580604
Change-Id: I6b5a1f572a7edf8135e059c67a2643d3736e40ab
 2014-09-23 16:40:53 -07:00
Alan Viverette
60004caeba am 9e84a6a0: Merge "Fix inaccurate TypedArray.getDrawable() documentation" into lmp-dev 
* commit '9e84a6a08b4ff50b745a6eaf35e52b9c7aef4c39':
  Fix inaccurate TypedArray.getDrawable() documentation
 2014-09-22 23:58:31 +00:00
Alan Viverette
fde4e3b17a Fix inaccurate TypedArray.getDrawable() documentation 
The documentation implied that you could override
Resources.getDrawable(int) to load custom drawables, which is
not the case.

BUG: 16635905
Change-Id: I06c0febe2d6d4194ef5a31f167b378fe311b7a2d
 2014-09-22 16:19:51 -07:00
Paul Soulos
f9390f56c6 am b5586e00: Fixes typo in Intent documentation 
* commit 'b5586e00ed5eb4b18b58371a54449f9cc8eedca8':
  Fixes typo in Intent documentation
 2014-09-19 19:32:36 +00:00
Paul Soulos
628cb74d8a Fixes typo in Intent documentation 
bug: 17583712
Change-Id: I37c77644213417751f8261098af44096aef51b14
 2014-09-19 19:10:04 +00:00
Dianne Hackborn
f2cf16436b am 31ce4c62: Merge "Fix issue #17564607: Apps in the managed profile can send any intent..." into lmp-dev 
* commit '31ce4c62e97cf7357707c894f6992f52a43c6c9d':
  Fix issue #17564607: Apps in the managed profile can send any intent...
 2014-09-19 04:17:41 +00:00
Dianne Hackborn
ace27915d2 Fix issue #17564607: Apps in the managed profile can send any intent... 
...to the primary user, even if it was not whitelisted to be forwarded.

The path where getActivityInfo is called for the ResolverActivity
would not correctly apply the requested user ID to the result, so
it wouldn't run under the correct user.

Change-Id: I1da47c54bbed26091832a28236d0b06762c92437
 2014-09-18 19:01:01 -07:00
Alan Viverette
06e9f5345e am 8766bdcb: Merge "Fix parsing of old-style intent URIs" into lmp-dev 
* commit '8766bdcb803698a2a2765bb46ab57bba655b41cf':
  Fix parsing of old-style intent URIs
 2014-09-18 21:09:54 +00:00
Alan Viverette
0adf32bc1e Fix parsing of old-style intent URIs 
Improves bounds checking to restrict category matches to within the
category(...) item. Fixes CTS failure in IntentTest.testGetIntentOld().

BUG: 17557490
Change-Id: I1859fe18eaa881b771bab373d705d8fbeb6406c4
 2014-09-18 12:53:16 -07:00
Jeff Sharkey
2d360218b4 am 1d98fbf2: Merge "Update API naming to follow style guide." into lmp-dev 
* commit '1d98fbf27258cbe98e9f7226cc6baedd83a80d3d':
  Update API naming to follow style guide.
 2014-09-15 22:01:59 +00:00
Ihab Awad
e11a3b798b am 336c84c3: Merge "Add system feature for ConnectionService API support (1/3)" into lmp-dev 
* commit '336c84c35722e221cb3ec5d99c3876a5e5015e2a':
  Add system feature for ConnectionService API support (1/3)
 2014-09-15 22:01:41 +00:00
Jeff Sharkey
49c0e7375b Merge "Update API naming to follow style guide." into lmp-dev 2014-09-15 21:51:18 +00:00
Jeff Sharkey
de74231f24 Update API naming to follow style guide. 
Bug: 17510755
Change-Id: If73d81b416355559592feb895a62132194f4ba62
 2014-09-15 14:17:46 -07:00
Ihab Awad
1ec6888685 Add system feature for ConnectionService API support (1/3) 
Bug: 17445268
Change-Id: Ibf52cb394f00d075afd07b883a91f00da84b3c85
 2014-09-15 09:10:54 -07:00
Alan Viverette
56c4f5c139 am 84670eef: Merge "Reduce instructions required to obtain and recycle TypedArray" into lmp-dev 
* commit '84670eef1f2d685efc98644914d2bb191d0e665c':
  Reduce instructions required to obtain and recycle TypedArray
 2014-09-14 21:04:59 +00:00
Alan Viverette
c6a65dfbff Merge "Reduce instructions required to obtain and recycle TypedArray" into lmp-dev 2014-09-14 20:04:38 +00:00
Alan Viverette
8b5b25b448 Reduce instructions required to obtain and recycle TypedArray 
Eliminates several field and method accesses by making the TypedArray
pool local to a single Resources object. Removes an unnecessary
synchronization.

ReadXmlAttrs averaged 0.069 ms/op before, 0.064 ms/op after.

BUG: 17484798
Change-Id: If790a5ba6596b47a04f117c8912974798a592052
 2014-09-13 19:30:11 -07:00
Tyler Gunn
6c8d6d74c0 resolved conflicts for merge of 66c16547 to lmp-sprout-dev 
Also fixed issue in TelephonyManager.

Change-Id: I4dde45e638c2bcf32f8f929d34d0083966f6761f
 2014-09-13 20:10:08 +00:00
Tyler Gunn
ef9f6f957d Renaming Telecomm to Telecom. 
- Changing package from android.telecomm to android.telecom
- Changing package from com.android.telecomm to
com.android.server.telecomm.
- Renaming TelecommManager to TelecomManager.

Bug: 17364651
Change-Id: I192cb5d189f55db012ea72ee82ccc5aedbc21638
 2014-09-12 22:16:17 -07:00
Amith Yamasani
57801c13d4 am 13c4e5ad: Merge "Rename and repurpose feature MANAGED_PROFILES to MANAGED_USERS" into lmp-dev 
* commit '13c4e5ad86bcf61e12d5f928ba36bc0db2dd75bf':
  Rename and repurpose feature MANAGED_PROFILES to MANAGED_USERS
 2014-09-13 00:08:23 +00:00
Amith Yamasani
1d653272a2 Rename and repurpose feature MANAGED_PROFILES to MANAGED_USERS 
Bug: 17392243
Change-Id: I5ff0e70eeeeba264c96eaa2a17a6bd3669576c96
 2014-09-12 16:45:33 -07:00
Kenny Guy
08786c2b61 am b5153aba: Hide APIs renamed during API review of LauncherApps 
* commit 'b5153aba264932068895228d3dde4e32a4ef271c':
  Hide APIs renamed during API review of LauncherApps
 2014-09-12 18:52:02 +00:00
Kenny Guy
b6edee0dad Hide APIs renamed during API review of LauncherApps 
Bug: 17390765
Change-Id: I79a979365005b13a2268b1cfe455241ae4fecb51
 2014-09-12 11:44:58 +00:00
Amith Yamasani
b9c6ad4e21 am 7c855708: Merge "Annotate bindServiceAsUser with SystemApi" into lmp-dev 
* commit '7c8557085241581d571ff22b3954fa20f99e6772':
  Annotate bindServiceAsUser with SystemApi
 2014-09-12 07:22:20 +00:00
Craig Mautner
56b3152d54 am 790a059b: Merge "If activity is an alias get maxRecents from target" into lmp-dev 
* commit '790a059b487646bd6aae1cdc866261a57375bb01':
  If activity is an alias get maxRecents from target
 2014-09-12 07:21:52 +00:00
Amith Yamasani
e1e98741ff Merge "Annotate bindServiceAsUser with SystemApi" into lmp-dev 2014-09-11 23:48:37 +00:00
Amith Yamasani
c85029f7d9 Annotate bindServiceAsUser with SystemApi 
Bug: 17470388
Change-Id: I0961e6ebabaffd91e3d152074b2f64ca4f9ba8fb
 2014-09-11 16:47:17 -07:00
Craig Mautner
3969cabf59 Merge "If activity is an alias get maxRecents from target" into lmp-dev 2014-09-11 23:02:27 +00:00
Craig Mautner
8307ea701c If activity is an alias get maxRecents from target 
Activity aliases do not pick up values in the PackageParser. The
actual values should come from the target activity instead.

Also ActivityInfo now propagates maxRecents in copy constructor
and across Binder calls (via parcelling).

Fixes bug 17391328.

Change-Id: I35d248032eca7557528c9d499b3b38f27c713d09
 2014-09-11 15:53:44 -07:00
Alexandra Gherghina
88de59f096 am e667e41b: Merge "Bugfix: use the correct user for ContentResolver calls" into lmp-dev 
* commit 'e667e41bb60cbe5e6bde545ecaf1c7d9c8b36af1':
  Bugfix: use the correct user for ContentResolver calls
 2014-09-11 16:21:27 +00:00
Alexandra Gherghina
ffb6343938 Merge "Bugfix: use the correct user for ContentResolver calls" into lmp-dev 2014-09-11 16:12:59 +00:00
Alexandra Gherghina
557186b0ac am b04106ed: Merge "Remove package level intent forwarding." into lmp-dev 
* commit 'b04106ed46919030b944b02a8a227f8fe343c5a5':
  Remove package level intent forwarding.
 2014-09-11 16:02:15 +00:00
Dianne Hackborn
35fc269dc6 am b4ee4428: Merge "Fix issue #17428001: Fix revokeUriPermissions" into lmp-dev 
* commit 'b4ee4428d34002aea54e9dc62902f14dedf69604':
  Fix issue #17428001: Fix revokeUriPermissions
 2014-09-11 15:59:19 +00:00
Adam Connors
e107c3eb79 Remove package level intent forwarding. 
Clean up unused methods.

Bug: 17389110
Change-Id: I8a80fe3e14219f06572de05c390cdda0efcbf5db
 2014-09-11 15:42:13 +01:00
Dianne Hackborn
547f6e1803 Merge "Fix issue #17428001: Fix revokeUriPermissions" into lmp-dev 2014-09-11 00:55:25 +00:00
Dianne Hackborn
192679a7d3 Fix issue #17428001: Fix revokeUriPermissions 
You can now revoke permissions that were granted to you.

Change-Id: I9a1872059edc715b10bbd2d653e45420d43331c3
 2014-09-10 16:20:24 -07:00
Alexandra Gherghina
03e1e83697 Bugfix: use the correct user for ContentResolver calls 
Bug: 16860604
Change-Id: I2de228442b7bd824a115f56a24d682d346737976
 2014-09-10 18:13:12 +01:00
Adam Connors
fb324578aa am 5e1fe70f: Merge "Add feature flags for verified boot and securely remove users." into lmp-dev 
* commit '5e1fe70f82a58b3afe87ed14f5c44e02e05ddccb':
  Add feature flags for verified boot and securely remove users.
 2014-09-10 10:16:38 +00:00
Adam Connors
c90f95c79d Merge "Add feature flags for verified boot and securely remove users." into lmp-dev 2014-09-10 10:07:15 +00:00
Adam Lesinski
7137ee38cb am 38bd55ff: Merge changes I79ba54d7,I224fb4b6 into lmp-dev 
* commit '38bd55ffd7084d744e4e814593056e1e12ebfb00':
  Make UsageStats API default on only for the system
  ActivityManager shouldn't return null for getCurrentUser
 2014-09-10 00:17:53 +00:00
Jeff Sharkey
1f43d44a07 am c5d4ebd6: Merge "Missing manifest error should be NO_CERTIFICATES." into lmp-dev 
* commit 'c5d4ebd640a0bca62fb52a42830c8646316ee386':
  Missing manifest error should be NO_CERTIFICATES.
 2014-09-10 00:16:35 +00:00
Adam Lesinski
732edf098f Merge changes I79ba54d7,I224fb4b6 into lmp-dev 
* changes:
  Make UsageStats API default on only for the system
  ActivityManager shouldn't return null for getCurrentUser
 2014-09-09 23:50:04 +00:00
Jeff Sharkey
ad5f44a68c Merge "Missing manifest error should be NO_CERTIFICATES." into lmp-dev 2014-09-09 22:44:52 +00:00