Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
161,276 Commits 3 Branches 0 Tags
f5c178bdd3fcfe261ea43cbeef5c325a615af0e1
Commit Graph

45273 Commits

Author SHA1 Message Date
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
Craig Mautner
7d06c3758d am 1b314af5: am 85241024: am d5dad300: am 43ce5500: Merge "Remove activity icon bitmaps from system process." into lmp-dev 
* commit '1b314af5a1a4f0d7f4be38b52caa3a2c28a1da4e':
  Remove activity icon bitmaps from system process.
 2014-09-18 22:25:39 +00: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
Alan Viverette
7e9cd14eff am 993fb7e9: am 9069fdda: am 8f1ee1d8: am 8766bdcb: Merge "Fix parsing of old-style intent URIs" into lmp-dev 
* commit '993fb7e906148c7f07cabd33bd22f2a4d707f4ca':
  Fix parsing of old-style intent URIs
 2014-09-18 21:52:12 +00: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
Alan Viverette
090537ee29 am 2f9ae13d: am f491d835: am 73d3c81c: am fb15b0e2: Merge "Use action bar theme for action modes, fix ViewStub inflation theme" into lmp-dev 
* commit '2f9ae13d5843d6f25cfaaf2db51b5a78e2a8ba33':
  Use action bar theme for action modes, fix ViewStub inflation theme
 2014-09-18 21:23:38 +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
Jon Miranda
f109b3ed28 am 9fdb986c: am a591604d: am dff9c8b3: am bff124f1: Merge "Adds support for Theme dumping via DDM." into lmp-dev 
* commit '9fdb986cae241670f6a280e46ea821931fd45cd0':
  Adds support for Theme dumping via DDM.
 2014-09-18 21:08:00 +00:00
John Reck
4958a0e9d4 am c669c6c7: am ef89494b: am 1d58768d: am e182b60c: Merge "Revert "Make starting window hw-accelerated"" into lmp-dev 
* commit 'c669c6c77525ec5908e8eb7d223b120d2623f698':
  Revert "Make starting window hw-accelerated"
 2014-09-18 21:00:37 +00:00
Jeff Brown
b115e5986b am bbeae741: am fb6989e4: am 6cabbdae: am d510278d: Merge "Create an Application object for the system process." into lmp-dev 
* commit 'bbeae741c75fbe7fba2a91ab4b8c7a95f987494d':
  Create an Application object for the system process.
 2014-09-18 21:00:33 +00:00
Martijn Coenen
eec243816a am 412d7a7c: am 6b3dc425: am 7142afa9: am 15af6c4e: Merge "Upper-case incoming AIDs." into lmp-dev 
* commit '412d7a7cffc0f43390ed6768b964150dbd5c70ef':
  Upper-case incoming AIDs.
 2014-09-18 20:56:17 +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
247c002899 am 98e4606a: am 38c76c33: am 39da65b2: am b029590f: Merge "Default to using hardware layer during fade transition." into lmp-dev 
* commit '98e4606a46954b05ab23cbf5d005a6c3543ed057':
  Default to using hardware layer during fade transition.
 2014-09-18 17:42:19 +00: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
Sander Alewijnse
fcb398f601 am fd9d7709: am c32f231c: am 2379e16f: am 81b375a1: Merge "Update targetSdkVersion check." into lmp-dev 
* commit 'fd9d770937e9d3c474d203513e74eccb002fbd8a':
  Update targetSdkVersion check.
 2014-09-18 12:18:27 +00:00
Sander Alewijnse
a65914f4d7 am 81b375a1: Merge "Update targetSdkVersion check." into lmp-dev 
* commit '81b375a12f3b71b7d7ef7582216dc59303247894':
  Update targetSdkVersion check.
 2014-09-18 11:45:53 +00:00
Sander Alewijnse
d4710c87e6 Merge "Update targetSdkVersion check." into lmp-dev 2014-09-18 11:36:19 +00:00
Adam Powell
76e8803f5e am a72bd678: am 400521f2: am aaceaabe: am 1e2f3d98: Merge "Fix UserManager#isUserAGoat" into lmp-dev 
* commit 'a72bd6782f42f4766fb0dcc6755d2e9cca6940f4':
  Fix UserManager#isUserAGoat
 2014-09-18 03:14:18 +00:00
Yigit Boyar
b8c19b1b33 Find activity from context in menu inflator for click events 
Bug: 17514128
Change-Id: I3028182a5bdb85eccd9db0faa13da9fc459af3c6
 2014-09-17 19:23:21 -07: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
5fd428f9af am f07d3ddb: am 840bb464: am da0f6ea9: am 50d23752: Merge "Use unified Tethering Permission Check" into lmp-dev 
* commit 'f07d3ddbd4b9d8332101827c735d255c9359e475':
  Use unified Tethering Permission Check
 2014-09-18 00:50:53 +00: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
Robert Greenwalt
f3b47e95b1 Merge "Use unified Tethering Permission Check" into lmp-dev 2014-09-18 00:02:16 +00:00
Robert Greenwalt
edb47668f0 Use unified Tethering Permission Check 
The BT and Wifi mechanisms for enabling Tethering did their own
permission checks.  This set of changes unifies the check into
a ConnectivityManager function so they can be kept in sync.

bug:17435527
Change-Id: I8c157a5acf56ffbddd349cb6a45160ae7be8541b
 2014-09-17 16:18:12 -07:00
George Mount
dc5bf6a7f0 Default to using hardware layer during fade transition. 
Bug 17499864

When hasOverlappingRendering() is true, a layer is used to
to fade views because performance can be much worse then.
When hasOverlappingRendering() is false, the performance
is not hurt and a layer is not used.

Change-Id: If3fb1c23ffc8d0bef85c9d16df6c26ff4bbd49ac
 2014-09-17 15:41:18 -07:00
Yigit Boyar
97e853d00c am 28d73a51: am 98171686: am bb837c51: am 7fa36f26: Merge "Handle action mode changes properly for actionbar tabs" into lmp-dev 
* commit '28d73a5176225216f1105a6a0910c04383db44cd':
  Handle action mode changes properly for actionbar tabs
 2014-09-17 21:42:21 +00:00
Jeff Brown
7fc8e357a4 Create an Application object for the system process. 
Change-Id: Icd959fd859a7a556fbcbc519ff8646e1bf95fedc
 2014-09-17 14:19:31 -07:00