Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
152,236 Commits 3 Branches 0 Tags
d422df7928f25111fa7c0722280e38cc92060704
Commit Graph

40727 Commits

Author SHA1 Message Date
Amith Yamasani
70a2afd10e am ba108d11: Merge "Allow primary user profile owner to set device restrictions" into lmp-dev 
* commit 'ba108d1178a1e7863d757fd146ae8d485088c5bc':
  Allow primary user profile owner to set device restrictions
 2014-09-19 16:02:59 +00:00
Amith Yamasani
8d9f121618 Merge "Allow primary user profile owner to set device restrictions" into lmp-dev 2014-09-19 15:51:39 +00:00
George Mount
6ac3f38143 am f187823e: Merge "Fix exception when fragment container has no View." into lmp-dev 
* commit 'f187823e02c34118ed6de23f844a043d3a64829c':
  Fix exception when fragment container has no View.
 2014-09-19 15:50:48 +00:00
George Mount
a667d5dc5e am 04a96bca: Merge "Fix NPE when shared element listener is null." into lmp-dev 
* commit '04a96bcad89cf917a57980cb77a90763f43b5b94':
  Fix NPE when shared element listener is null.
 2014-09-19 15:50:44 +00:00
George Mount
8f8f5f579f Merge "Fix exception when fragment container has no View." into lmp-dev 2014-09-19 15:39:45 +00:00
George Mount
a1e7d53b0a Merge "Fix NPE when shared element listener is null." into lmp-dev 2014-09-19 15:39:03 +00:00
Kenny Guy
57224fae58 am 4996d6a4: Merge "Remove suggested key names as its confusing." into lmp-dev 
* commit '4996d6a4ff983167133779a78bad4282d8bce4b3':
  Remove suggested key names as its confusing.
 2014-09-19 09:55:37 +00:00
Kenny Guy
52ee328054 Merge "Remove suggested key names as its confusing." into lmp-dev 2014-09-19 09:44:23 +00:00
Yohei Yukawa
2b6307c894 am 8e1c6a06: Merge "Speculative fix of IMMS crash" into lmp-dev 
* commit '8e1c6a06dcd32faf10b9bdc9c9eb0d6cc055b7e5':
  Speculative fix of IMMS crash
 2014-09-19 06:21:05 +00:00
Dan Sandler
103daa0c49 am c990927b: Merge "Fix LayoutInflater copy constructor logic." into lmp-dev 
* commit 'c990927be5a90d0c8d0ad6d8b9e75d8b15cc717c':
  Fix LayoutInflater copy constructor logic.
 2014-09-19 05:29:34 +00:00
Yohei Yukawa
d66a7324cc Merge "Speculative fix of IMMS crash" into lmp-dev 2014-09-19 05:19:04 +00:00
Yohei Yukawa
fcedfa0190 Speculative fix of IMMS crash 
This CL is a follow up CL for I6571d464a46453934f0a8f5e790.

Do not propagate Resources.NotFoundException to the caller
of InputMethodInfo.isDefault().

BUG: 17553712
BUG: 17549437
BUG: 17517332

Change-Id: Ie95880c1f68f49eb63518e69b7dfa20af3ce8737
 2014-09-19 05:02:59 +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
Yigit Boyar
6a0c7b1ba8 am 6cdaab18: Merge "Fix scroll position calculation when clipToPadding is false" into lmp-dev 
* commit '6cdaab18f323108f599d54d636f8fcc9bd7af278':
  Fix scroll position calculation when clipToPadding is false
 2014-09-19 04:08:55 +00:00
Dan Sandler
20d01ad8a1 Merge "Fix LayoutInflater copy constructor logic." into lmp-dev 2014-09-19 03:32:31 +00:00
Dan Sandler
0c7bb33e03 Fix LayoutInflater copy constructor logic. 
Avoids an NPE in mFilterMap.

Bug: 17548265
Change-Id: I6556373862f706dbcf5549eaec61c3e10a47b482
 2014-09-18 22:23:32 -04: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
Yigit Boyar
91803838c8 Merge "Fix scroll position calculation when clipToPadding is false" into lmp-dev 2014-09-19 00:59:53 +00:00
Yigit Boyar
40c6c555e9 Fix scroll position calculation when clipToPadding is false 
Bug: 17568582
Change-Id: I904450d62c93105db5c61a071c7816278bb441be
 2014-09-18 16:31:52 -07:00
George Mount
d137a27e16 am 085cb2d2: Merge "Fix broken logic in isValidTarget" into lmp-dev 
* commit '085cb2d2f23ee497ddfb94b970da27d782b49dc0':
  Fix broken logic in isValidTarget
 2014-09-18 23:01:45 +00:00
George Mount
7343ba2f80 Merge "Fix broken logic in isValidTarget" into lmp-dev 2014-09-18 22:51:23 +00:00
George Mount
1732f52895 Fix NPE when shared element listener is null. 
Bug 17544867

The shared element listener will be null after the transitions
have been canceled.

Change-Id: Id1182639b44ece27fc267702623641438f9974d5
 2014-09-18 15:32:47 -07:00
George Mount
0b26e4d58a Fix exception when fragment container has no View. 
Bug 17535259

Change-Id: I29c9ef53dd693cbb4043ebfb4750753870c9e99a
 2014-09-18 15:24:48 -07:00
Amith Yamasani
c34dc7cdeb Allow primary user profile owner to set device restrictions 
In addition to device owners, profile owners on the primary user
can also set user restrictions that are necessary to lock down the
user.

This is to enable the case of a profile owner registered after setup
wizard is completed, on the primary user.

Also make managed profile vs. profile wording consistent in the
DevicePolicyManager docs.

Bug: 17555025
Change-Id: Ib9d08b8af34a99b25e11757fa7dc83673a7deb32
 2014-09-18 15:14:26 -07:00
Craig Mautner
1ef73b3903 am 43ce5500: Merge "Remove activity icon bitmaps from system process." into lmp-dev 
* commit '43ce550039eb45dd0b6ff6d4abd7833cba2d06e0':
  Remove activity icon bitmaps from system process.
 2014-09-18 21:36:55 +00:00
Craig Mautner
bc3126f859 Merge "Remove activity icon bitmaps from system process." into lmp-dev 2014-09-18 21:25:24 +00:00
Craig Mautner
648f69b95c Remove activity icon bitmaps from system process. 
When a TaskDescription is sent up to the system process, the Bitmap
contained in the mIcon member is immediately flushed to disk and the
name of the file replaces it in the TaskDescription. Thereby saving
mucho RAM for better uses.

Fixes bug 17527308.

Change-Id: Ifac63ea5d12ed091d1eb03e178b8b847a827f940
 2014-09-18 14:16:26 -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
50572be361 Merge "Fix parsing of old-style intent URIs" into lmp-dev 2014-09-18 20:54:44 +00:00
Alan Viverette
e88d918fbe am fb15b0e2: Merge "Use action bar theme for action modes, fix ViewStub inflation theme" into lmp-dev 
* commit 'fb15b0e2566d80dbedc8f91bdc0a1edb88ce1ec2':
  Use action bar theme for action modes, fix ViewStub inflation theme
 2014-09-18 20:35:39 +00:00
Alan Viverette
07ecc748fb Merge "Use action bar theme for action modes, fix ViewStub inflation theme" into lmp-dev 2014-09-18 20:25:22 +00:00
Jon Miranda
583a766054 am bff124f1: Merge "Adds support for Theme dumping via DDM." into lmp-dev 
* commit 'bff124f1e86a6cfc1710d41bedd060b7378de06b':
  Adds support for Theme dumping via DDM.
 2014-09-18 20:24:34 +00:00
Jon Miranda
3c7f018f42 Merge "Adds support for Theme dumping via DDM." into lmp-dev 2014-09-18 20:14:05 +00:00
John Reck
edfef021a7 am e182b60c: Merge "Revert "Make starting window hw-accelerated"" into lmp-dev 
* commit 'e182b60cb71437d1f2adf258a248b2e6b0f59821':
  Revert "Make starting window hw-accelerated"
 2014-09-18 20:11:51 +00:00
John Reck
7e3d6c988c Merge "Revert "Make starting window hw-accelerated"" into lmp-dev 2014-09-18 20:01:15 +00:00
Jeff Brown
5dcad55b96 am d510278d: Merge "Create an Application object for the system process." into lmp-dev 
* commit 'd510278d491ed9669c198ee79377a0ff1ab2fc48':
  Create an Application object for the system process.
 2014-09-18 20:00:32 +00:00
Jeff Brown
2b5f91fe98 Merge "Create an Application object for the system process." into lmp-dev 2014-09-18 19:53:37 +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
John Reck
61375a8bb5 Revert "Make starting window hw-accelerated" 
Bug: 17516789

This change corresponds to a sudden influx of bad surface crashes.
Reverting to see if stability returns as this was an optimization
CL

This reverts commit 29ff1bc57ac2c995c56f15ed6e56e5fb247b2a44.

Change-Id: I7835e89017161d94ad05fe46d81bd437c3dae3a7
 2014-09-18 19:29:23 +00:00
Martijn Coenen
9cba2fff2f am 15af6c4e: Merge "Upper-case incoming AIDs." into lmp-dev 
* commit '15af6c4e0717b49b84ea32159fea7e4b7ceb48a6':
  Upper-case incoming AIDs.
 2014-09-18 19:00:20 +00:00
Martijn Coenen
da6ffa06b7 Merge "Upper-case incoming AIDs." into lmp-dev 2014-09-18 18:52:57 +00:00
Jon Miranda
e82a4eeb40 Adds support for Theme dumping via DDM. 
Bug: 17515415
Change-Id: Ice145a4b452177e36345cf2e071377bb7b3feeb3
 2014-09-18 11:29:08 -07:00
George Mount
cc82424b44 Fix broken logic in isValidTarget 
Bug 17553253

Change-Id: I9f3f2c80e59128fd5f8d4b1b2a67692c00804f62
 2014-09-18 11:21:09 -07:00
George Mount
510ca08d9e am b029590f: Merge "Default to using hardware layer during fade transition." into lmp-dev 
* commit 'b029590fdbba56b5e09dc2e48b4045aefadcf26f':
  Default to using hardware layer during fade transition.
 2014-09-18 17:09:12 +00:00
George Mount
48af9ddbb6 Merge "Default to using hardware layer during fade transition." into lmp-dev 2014-09-18 16:56:46 +00:00
Kenny Guy
d00cfc51fb Remove suggested key names as its confusing. 
Update java doc to not suggest package names
as it confused people into thinking it would
limit access to that package which isn't the
case.

Bug: 15177676
Change-Id: I0736976956d8bb604e5097326c8c4316b3007d64
 2014-09-18 16:34:45 +01:00
Adam Powell
6769191bee am 1e2f3d98: Merge "Fix UserManager#isUserAGoat" into lmp-dev 
* commit '1e2f3d98e74c1b0d81fa536a70241bb998d29036':
  Fix UserManager#isUserAGoat
 2014-09-18 01:43:03 +00:00
Alan Viverette
a9ddb8dc23 Use action bar theme for action modes, fix ViewStub inflation theme 
BUG: 17262483
BUG: 17513621
Change-Id: I74764570a11da162a224e94978e21e52d17e2e84
 2014-09-17 18:14:32 -07:00
Adam Powell
988ae30ff7 Fix UserManager#isUserAGoat 
Correctly detect if the user is a goat.

Change-Id: I78577dd7ec8c3685434ee03560010a6ea4db127f
 2014-09-17 18:12:13 -07:00
Robert Greenwalt
a35bd707e0 am 50d23752: Merge "Use unified Tethering Permission Check" into lmp-dev 
* commit '50d2375281ac0743daf55680611b3387cc55fb2c':
  Use unified Tethering Permission Check
 2014-09-18 00:11:55 +00:00