Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
176,386 Commits 3 Branches 0 Tags
afda110a489788e514708564e95b32d930fd97a3
Commit Graph

64745 Commits

Author SHA1 Message Date
Robert Greenwalt
48af2cf8cd am 83c0b096: am 98f81182: am 647b437d: Merge "Separate voice/data roaming state and type" into lmp-mr1-dev 
* commit '83c0b096b775e7b39f89c2da1c9a8193555c0178':
  Separate voice/data roaming state and type
 2014-12-04 20:45:03 +00:00
Eino-Ville Talvala
1aef3b1eb4 am 431b65d1: am 6e21817b: am d23f8b44: Merge "Revert "Camera: Add new capability flags as system features as well"" into lmp-mr1-dev 
* commit '431b65d11fa79ee1acf55e1de0d074fe9913a51d':
  Revert "Camera: Add new capability flags as system features as well"
 2014-12-04 20:44:58 +00:00
Dianne Hackborn
c22369be46 am 3c8a439b: am e6333e51: am f696efa2: Merge "Fix issue #17948584: Application crash and phone restart when app..." into lmp-mr1-dev 
* commit '3c8a439be33932f35b723271cec5cd4210c19221':
  Fix issue #17948584: Application crash and phone restart when app...
 2014-12-04 20:44:53 +00:00
Alan Viverette
1a1b89485d am 979ed514: am 3977137d: am d3adf098: Merge "Slightly more button elevation to match Material spec" into lmp-mr1-dev 
* commit '979ed5140baf4e89d0aaaec39c0c2b8033c401bf':
  Slightly more button elevation to match Material spec
 2014-12-04 20:44:49 +00:00
Yin-Chia Yeh
e01ae15296 am e168dd28: am 871571ae: am 38134308: Merge "Camera: update antibanding spec" into lmp-mr1-dev 
* commit 'e168dd28f8fedc921e8b08bdce71c20ab60966ee':
  Camera: update antibanding spec
 2014-12-04 20:44:39 +00:00
Robert Greenwalt
83c0b096b7 am 98f81182: am 647b437d: Merge "Separate voice/data roaming state and type" into lmp-mr1-dev 
* commit '98f81182fb61953e0712bd788941710b6ad842c2':
  Separate voice/data roaming state and type
 2014-12-04 20:23:55 +00:00
Eino-Ville Talvala
431b65d11f am 6e21817b: am d23f8b44: Merge "Revert "Camera: Add new capability flags as system features as well"" into lmp-mr1-dev 
* commit '6e21817b8ef160fae5e7046745cb11ceab06b2d7':
  Revert "Camera: Add new capability flags as system features as well"
 2014-12-04 20:23:45 +00:00
Dianne Hackborn
3c8a439be3 am e6333e51: am f696efa2: Merge "Fix issue #17948584: Application crash and phone restart when app..." into lmp-mr1-dev 
* commit 'e6333e5188fd4becf7dea286c768f55c3b89d63e':
  Fix issue #17948584: Application crash and phone restart when app...
 2014-12-04 20:23:25 +00:00
Alan Viverette
979ed5140b am 3977137d: am d3adf098: Merge "Slightly more button elevation to match Material spec" into lmp-mr1-dev 
* commit '3977137d865637297b4723ec8784d5b97fc316dc':
  Slightly more button elevation to match Material spec
 2014-12-04 20:23:18 +00:00
Yin-Chia Yeh
e168dd28f8 am 871571ae: am 38134308: Merge "Camera: update antibanding spec" into lmp-mr1-dev 
* commit '871571ae0c4d8f334265b99e274892346756d51b':
  Camera: update antibanding spec
 2014-12-04 20:23:00 +00:00
Svet Ganov
3ce873349c Merge "Update accessibility event constants in the service registration XML." 2014-12-04 17:24:21 +00:00
Yohann Roussel
e1c00320b6 Merge "Allow compilation with Jack." 2014-12-04 09:26:54 +00:00
Geoff Mendal
4d69f10d56 Merge "Import translations. DO NOT MERGE" 2014-12-04 05:29:42 +00:00
Svet Ganov
fdd2442b62 Update accessibility event constants in the service registration XML. 
An accessibility service may be configured to receive only certain event
types in the meta-data XML file. This change adds some missing event types
to the possible events to register for in the XML. This ensures parity
between the Java API and the XML declaration.

bug:18528776

Change-Id: Ie516f356db81fb1fb39f8d3a61b1edcbba1c7448
 2014-12-04 01:10:47 +00:00
Robert Greenwalt
98f81182fb am 647b437d: Merge "Separate voice/data roaming state and type" into lmp-mr1-dev 
* commit '647b437d0772a8c73ac3936b2f8e69d4bd1953d3':
  Separate voice/data roaming state and type
 2014-12-03 23:00:34 +00:00
Eino-Ville Talvala
6e21817b8e am d23f8b44: Merge "Revert "Camera: Add new capability flags as system features as well"" into lmp-mr1-dev 
* commit 'd23f8b44d575dcdc00965aae5fffd97f0336df43':
  Revert "Camera: Add new capability flags as system features as well"
 2014-12-03 23:00:15 +00:00
Robert Greenwalt
647b437d07 Merge "Separate voice/data roaming state and type" into lmp-mr1-dev 2014-12-03 22:18:24 +00:00
Eino-Ville Talvala
d23f8b44d5 Merge "Revert "Camera: Add new capability flags as system features as well"" into lmp-mr1-dev 2014-12-03 22:01:42 +00:00
Sreeram Ramachandran
16d75742fc am 3a8fbb80: am 95e4474c: am 932c3321: Merge "Fix docs per API review." into lmp-mr1-dev 
* commit '3a8fbb8072f564c6da9b7655c1c90b26670d2f12':
  Fix docs per API review.
 2014-12-03 21:51:05 +00:00
Etan Cohen
64d3c1402a am a2ab707c: am 89b55fc5: am 7ab0ad1f: Add a global override for VoLTE calls (which leaves user setting in place) 
* commit 'a2ab707c87b8129873078dcea8effdd970de67c3':
  Add a global override for VoLTE calls (which leaves user setting in place)
 2014-12-03 21:51:00 +00:00
Winson Chung
3b8887d540 am fee5e3d3: am 50511096: am de9848c6: Merge "Initial changes to add callback on task stack changes. (Bug 17672056, Bug 18291345)" into lmp-mr1-dev 
* commit 'fee5e3d32a26c3ac2136e37cad15fd9cc41066db':
  Initial changes to add callback on task stack changes. (Bug 17672056, Bug 18291345)
 2014-12-03 21:50:36 +00:00
Dianne Hackborn
98866d1179 am b46e9da6: am bedd1744: am ef44c051: Merge "Work on issue #18572506: AppOps in-memory state is invalid after..." into lmp-mr1-dev 
* commit 'b46e9da64c51bcbfdd21b8e18850064eeb50d930':
  Work on issue #18572506: AppOps in-memory state is invalid after...
 2014-12-03 21:50:10 +00:00
Lorenzo Colitti
41762ecac0 am 45cd4df6: am d99cd44f: am dc99c504: Merge "Make StatusBar display all default networks." into lmp-mr1-dev 
* commit '45cd4df6a0915558efa6bf4ec9c61fadff70572f':
  Make StatusBar display all default networks.
 2014-12-03 21:49:38 +00:00
Filip Gruszczynski
9da0c5e647 am 35a2d360: am 0821a566: am f675cad8: am 6e854ce5: Merge "Add overscan insets to surface frame dimensions in WallpaperService." into lmp-sprout-dev 
* commit '35a2d36085f4b4063fa5c91ad575660e009d1e3d':
  Add overscan insets to surface frame dimensions in WallpaperService.
 2014-12-03 21:49:33 +00:00
Dianne Hackborn
e6333e5188 am f696efa2: Merge "Fix issue #17948584: Application crash and phone restart when app..." into lmp-mr1-dev 
* commit 'f696efa206089bde1274d972239ffb5a8185f613':
  Fix issue #17948584: Application crash and phone restart when app...
 2014-12-03 21:38:08 +00:00
Dianne Hackborn
f696efa206 Merge "Fix issue #17948584: Application crash and phone restart when app..." into lmp-mr1-dev 2014-12-03 21:32:17 +00:00
Alan Viverette
3977137d86 am d3adf098: Merge "Slightly more button elevation to match Material spec" into lmp-mr1-dev 
* commit 'd3adf0986ba53b794ac8f8b70a8784ca6945d4ba':
  Slightly more button elevation to match Material spec
 2014-12-03 21:12:30 +00:00
Alan Viverette
d3adf0986b Merge "Slightly more button elevation to match Material spec" into lmp-mr1-dev 2014-12-03 21:10:21 +00:00
Yin-Chia Yeh
871571ae0c am 38134308: Merge "Camera: update antibanding spec" into lmp-mr1-dev 
* commit '381343088f964b6428c483f741424a50ef41cb49':
  Camera: update antibanding spec
 2014-12-03 20:54:23 +00:00
Yin-Chia Yeh
381343088f Merge "Camera: update antibanding spec" into lmp-mr1-dev 2014-12-03 20:44:05 +00:00
Sreeram Ramachandran
3a8fbb8072 am 95e4474c: am 932c3321: Merge "Fix docs per API review." into lmp-mr1-dev 
* commit '95e4474c7069bdd85178aab96182bc0088b43a70':
  Fix docs per API review.
 2014-12-03 20:43:50 +00:00
Etan Cohen
a2ab707c87 am 89b55fc5: am 7ab0ad1f: Add a global override for VoLTE calls (which leaves user setting in place) 
* commit '89b55fc52d0ad20013353af32e7d4823d95db575':
  Add a global override for VoLTE calls (which leaves user setting in place)
 2014-12-03 20:43:46 +00:00
Winson Chung
fee5e3d32a am 50511096: am de9848c6: Merge "Initial changes to add callback on task stack changes. (Bug 17672056, Bug 18291345)" into lmp-mr1-dev 
* commit '50511096998ffff4fa5c001e46b056201fb0b892':
  Initial changes to add callback on task stack changes. (Bug 17672056, Bug 18291345)
 2014-12-03 20:42:45 +00:00
Dianne Hackborn
b46e9da64c am bedd1744: am ef44c051: Merge "Work on issue #18572506: AppOps in-memory state is invalid after..." into lmp-mr1-dev 
* commit 'bedd1744b2afa0ede3ab7ac38a0e4a2111ed53bf':
  Work on issue #18572506: AppOps in-memory state is invalid after...
 2014-12-03 20:42:17 +00:00
Lorenzo Colitti
45cd4df6a0 am d99cd44f: am dc99c504: Merge "Make StatusBar display all default networks." into lmp-mr1-dev 
* commit 'd99cd44f317a0e1b188a0033ebe4948f13c32491':
  Make StatusBar display all default networks.
 2014-12-03 20:41:10 +00:00
Filip Gruszczynski
35a2d36085 am 0821a566: am f675cad8: am 6e854ce5: Merge "Add overscan insets to surface frame dimensions in WallpaperService." into lmp-sprout-dev 
* commit '0821a56668aa0289b137eb510f35aed54784dc3b':
  Add overscan insets to surface frame dimensions in WallpaperService.
 2014-12-03 20:40:56 +00:00
Sreeram Ramachandran
95e4474c70 am 932c3321: Merge "Fix docs per API review." into lmp-mr1-dev 
* commit '932c33214729fe2d2b09f82ef60a72871f182654':
  Fix docs per API review.
 2014-12-03 19:50:19 +00:00
Etan Cohen
89b55fc52d am 7ab0ad1f: Add a global override for VoLTE calls (which leaves user setting in place) 
* commit '7ab0ad1ffe858dbf82d5c3b540c02488f31c51f0':
  Add a global override for VoLTE calls (which leaves user setting in place)
 2014-12-03 19:50:13 +00:00
Geoff Mendal
ed04e15d15 Import translations. DO NOT MERGE 
Change-Id: I753241123c9565a5800ef2d3e48eddecb62aa2a8
Auto-generated-cl: translation import
 2014-12-03 11:19:37 -08:00
Sreeram Ramachandran
932c332147 Merge "Fix docs per API review." into lmp-mr1-dev 2014-12-03 19:15:38 +00:00
Eino-Ville Talvala
08a125562c Revert "Camera: Add new capability flags as system features as well" 
This reverts commit 6aee1d2ba5.
But leaves in some of the improved documentation.

Bug: 18281970
Bug: 18573576
Change-Id: I320f2229456ac039bc8f3cd8bc8b4ea6cf0e80eb
 2014-12-03 11:12:39 -08:00
Etan Cohen
7ab0ad1ffe Add a global override for VoLTE calls (which leaves user setting in place) 
Bug: 18446228
Change-Id: I7d07f066e5933c2aeecf9222bb54da69975099bc
 2014-12-03 18:56:45 +00:00
Sreeram Ramachandran
9e956e9b9a Fix docs per API review. 
Bug: 18573918
Change-Id: I639fe2ce40cdef57d904b9ad1ebb28db7d057144
 2014-12-03 10:53:35 -08:00
Winson Chung
5051109699 am de9848c6: Merge "Initial changes to add callback on task stack changes. (Bug 17672056, Bug 18291345)" into lmp-mr1-dev 
* commit 'de9848c641e1b1e0f73e5655c3f8c0c3b34a011c':
  Initial changes to add callback on task stack changes. (Bug 17672056, Bug 18291345)
 2014-12-03 18:36:15 +00:00
Dianne Hackborn
bedd1744b2 am ef44c051: Merge "Work on issue #18572506: AppOps in-memory state is invalid after..." into lmp-mr1-dev 
* commit 'ef44c0514d497a789dca4731da61a2cf49bb3289':
  Work on issue #18572506: AppOps in-memory state is invalid after...
 2014-12-03 18:35:46 +00:00
Dianne Hackborn
1bc177c585 Fix issue #17948584: Application crash and phone restart when app... 
...is installed with <provider> with empty string.

Don't allow empty authorities, just like we don't allow null authorities.

Change-Id: I5c64592a639efe4dba848bd6f0efe4257f1565a2
 2014-12-03 10:20:30 -08:00
Winson Chung
de9848c641 Merge "Initial changes to add callback on task stack changes. (Bug 17672056, Bug 18291345)" into lmp-mr1-dev 2014-12-03 18:10:38 +00:00
Dianne Hackborn
ef44c0514d Merge "Work on issue #18572506: AppOps in-memory state is invalid after..." into lmp-mr1-dev 2014-12-03 18:03:27 +00:00
Dianne Hackborn
7b7c58b384 Work on issue #18572506: AppOps in-memory state is invalid after... 
...uninstalling updates to a system app

Things seem to be working fine, however we were not as aggressive at
writing out the current state in this case as we probably should be.

Also introduce more features to the appops command, which are useful
for testing this.

Change-Id: I177a9cc0e16e98b76fee0d052d742e06842bb3f9
 2014-12-03 10:01:14 -08:00
Tor Norbye
0ab6472237 Merge "Add BIND_IMPORTANT to @BindServiceFlags" 2014-12-03 17:38:41 +00:00